commit bd53dbff51079dc26ea27b00d94b28a5229c0fec
author Junio C Hamano <junio@hera.kernel.org> Sun Jan 18 18:26:37 2009
committer Junio C Hamano <junio@hera.kernel.org> Sun Jan 18 18:26:37 2009
tree ed0a78743f67e293b2302e91fefa24e6e579c428
parent 4efe0e79bcead21602c1f6669f07d4739358ca1a

Autogenerated HTML docs for v1.6.1-203-ga83c8 

git-mergetool.html

diff --git a/git-mergetool.html b/git-mergetool.html index a94269f..e0454ec 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -335,7 +335,10 @@  <div class="sectionbody">   <div class="vlist"><dl>   <dt>  --t or --tool=&lt;tool&gt;  +-t &lt;tool&gt;  +</dt>  +<dt>  +--tool=&lt;tool&gt;   </dt>   <dd>   <p>  @@ -373,7 +376,10 @@  success of the resolution after the custom tool has exited.</p></div>   </dd>   <dt>  --y or --no-prompt  +-y  +</dt>  +<dt>  +--no-prompt   </dt>   <dd>   <p>  @@ -407,7 +413,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2009-01-01 22:04:58 UTC  +Last updated 2009-01-18 18:26:22 UTC   </div>   </div>   </body>